From 5a4d4680ae6904da9fdd9b384fa7eaea2580626d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 7 Apr 2005 06:15:12 +0000 Subject: [PATCH] Replace an explicit pkg-config by $PKG_CONFIG. (#168074, Hans-Wolfgang 2005-04-07 Matthias Clasen * configure.in: Replace an explicit pkg-config by $PKG_CONFIG. (#168074, Hans-Wolfgang Loidl) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ configure.in | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bf82f47c12..713131c9a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-04-07 Matthias Clasen + * configure.in: Replace an explicit pkg-config by + $PKG_CONFIG. (#168074, Hans-Wolfgang Loidl) + * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bf82f47c12..713131c9a5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-04-07 Matthias Clasen + * configure.in: Replace an explicit pkg-config by + $PKG_CONFIG. (#168074, Hans-Wolfgang Loidl) + * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bf82f47c12..713131c9a5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-04-07 Matthias Clasen + * configure.in: Replace an explicit pkg-config by + $PKG_CONFIG. (#168074, Hans-Wolfgang Loidl) + * gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Ignore regions which fall completely outside the line. (#165862, Felipe Heidrich) diff --git a/configure.in b/configure.in index fec169aa1e..69ab1860a1 100644 --- a/configure.in +++ b/configure.in @@ -1084,7 +1084,7 @@ if test "x$gdktarget" = "xx11"; then if test $pango_omitted_x_deps = yes ; then # Old versions of Xft didn't necessarily include -lX11 in the output - x_libs="`pkg-config --libs xft` -lX11 $X_EXTRA_LIBS" + x_libs="`$PKG_CONFIG --libs xft` -lX11 $X_EXTRA_LIBS" fi ## Strip the .la files -- 2.30.2